Alignments with variable row heights almost works perfectly.

However, I'm going to have to figure a way to store the alignments
for rows separately, this may involve using a separate GtkCellAreaContext
for each row, unfortunately.

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 3fa0ba38decf17acf20761e7a85f98f9b38cf61b..38852a234a8be4656c31c7ba7031619f8abb94e3 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -2682,8 +2682,6 @@ gtk_icon_view_layout_single_row (GtkIconView *icon_view,
 
       current_width += item->width;
 
-      max_height = MAX (max_height, item->height);
-
       if (items != first_item)
        {
          if ((icon_view->priv->columns <= 0 && current_width > allocation.width) ||
@@ -2691,6 +2689,8 @@ gtk_icon_view_layout_single_row (GtkIconView *icon_view,
            break;
        }
 
+      max_height = MAX (max_height, item->height);
+
       current_width += icon_view->priv->column_spacing;
 
       item->y = *y;